From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 12 Mar 2009 10:59:19 +0000 (+0000)
Subject: xend: Correctly catch invalid domain lookups
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13992^2~102
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=7865c25877a120f803b63b67e7529ef2ed56ac0b;p=xen.git

xend: Correctly catch invalid domain lookups

If a client asks about a non-existent domain, report the error back
properly instead of just backtracing within xend.

Signed-off-by: John Levon <john.levon@sun.com>
---

diff --git a/tools/python/xen/web/SrvDir.py b/tools/python/xen/web/SrvDir.py
index 7d8001ad1e..807da69b3a 100644
--- a/tools/python/xen/web/SrvDir.py
+++ b/tools/python/xen/web/SrvDir.py
@@ -20,7 +20,7 @@ import types
 from xen.xend import sxp
 from xen.xend import PrettyPrint
 from xen.xend.Args import ArgError
-from xen.xend.XendError import XendError
+from xen.xend.XendError import XendError, XendInvalidDomain
 #from xen.xend.XendLogging import log
 
 import resource
@@ -71,6 +71,8 @@ class SrvDir(SrvBase):
             val = self.get(x)
         except XendError, ex:
             return self.noChild(str(ex))
+        except XendInvalidDomain, ex:
+            return self.noChild(str(ex))
         if val is None:
             return self.noChild('Not found: ' + str(x))
         else: